merge
authorStefano Stabellini <sstabellini@xensource.com>
Wed, 4 Aug 2010 14:58:10 +0000 (15:58 +0100)
committerStefano Stabellini <sstabellini@xensource.com>
Wed, 4 Aug 2010 14:58:10 +0000 (15:58 +0100)

Trivial merge